Skip to content

[18.0-fr3] Fix tolerations API placement and implementation#1553

Merged
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:18.0-fr3from
openshift-cherrypick-robot:cherry-pick-1552-to-18.0-fr3
Aug 6, 2025
Merged

[18.0-fr3] Fix tolerations API placement and implementation#1553
openshift-merge-bot[bot] merged 1 commit into
openstack-k8s-operators:18.0-fr3from
openshift-cherrypick-robot:cherry-pick-1552-to-18.0-fr3

Conversation

@openshift-cherrypick-robot

@openshift-cherrypick-robot openshift-cherrypick-robot commented Aug 6, 2025

Copy link
Copy Markdown

This is an automated cherry-pick of #1552

/assign stuggi

Jira: OSPRH-18693

Move tolerations from ContainerSpec to OperatorSpec level since
tolerations are deployment/pod-level configuration, not container-level.

Changes:
- Move Tolerations field from ContainerSpec to OperatorSpec in API types
- Update override logic to use correct field path (opOvr.Tolerations)
- Fix test cases to use OperatorSpec.Tolerations instead of ControllerManager.Tolerations
- Fix YAML indentation in sample configuration

This corrects the API design to follow Kubernetes conventions where
tolerations are specified at the pod template level, not per container.

Signed-off-by: Martin Schuppert <mschuppert@redhat.com>
@ratailor

ratailor commented Aug 6, 2025

Copy link
Copy Markdown
Contributor

lgtm. clean cherry-pick and merged on main branch.

@stuggi stuggi left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/lgtm

@openshift-ci openshift-ci Bot added the lgtm label Aug 6, 2025
@openshift-ci

openshift-ci Bot commented Aug 6, 2025

Copy link
Copy Markdown
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: openshift-cherrypick-robot, stuggi

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved label Aug 6, 2025
@stuggi

stuggi commented Aug 6, 2025

Copy link
Copy Markdown
Contributor

/override ci/prow/precommit-check

@openshift-ci

openshift-ci Bot commented Aug 6, 2025

Copy link
Copy Markdown
Contributor

@stuggi: Overrode contexts on behalf of stuggi: ci/prow/precommit-check

Details

In response to this:

/override ci/prow/precommit-check

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository.

@openshift-merge-bot openshift-merge-bot Bot merged commit 7811dd8 into openstack-k8s-operators:18.0-fr3 Aug 6, 2025
8 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants